Normalize the position so we don't create paths with off-list indices.

Sun Aug 22 13:32:33 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkliststore.c (gtk_list_store_insert): Normalize the
	position so we don't create paths with off-list
	indices. (#150320).

diff --git a/ChangeLog b/ChangeLog
index e0d6c2e8f2273bab49509f8dbedc494e88803acb..e28da93397f22c0ea5e4a9ef258eea25130c23ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 22 13:32:33 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkliststore.c (gtk_list_store_insert): Normalize the
+       position so we don't create paths with off-list
+       indices. (#150320).
+
 Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e0d6c2e8f2273bab49509f8dbedc494e88803acb..e28da93397f22c0ea5e4a9ef258eea25130c23ac 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Aug 22 13:32:33 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkliststore.c (gtk_list_store_insert): Normalize the
+       position so we don't create paths with off-list
+       indices. (#150320).
+
 Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e0d6c2e8f2273bab49509f8dbedc494e88803acb..e28da93397f22c0ea5e4a9ef258eea25130c23ac 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Aug 22 13:32:33 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkliststore.c (gtk_list_store_insert): Normalize the
+       position so we don't create paths with off-list
+       indices. (#150320).
+
 Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e0d6c2e8f2273bab49509f8dbedc494e88803acb..e28da93397f22c0ea5e4a9ef258eea25130c23ac 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Aug 22 13:32:33 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkliststore.c (gtk_list_store_insert): Normalize the
+       position so we don't create paths with off-list
+       indices. (#150320).
+
 Sun Aug 22 12:04:59 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Use the

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 95700acc9a66329c6a2e1ce04dd519bf85809198..3a8c8e0e1065689204c09c5a1aa35b3ca350ef2c 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -970,6 +970,7 @@ gtk_list_store_insert (GtkListStore *list_store,
   GtkTreePath *path;
   GtkSequence *seq;
   GtkSequencePtr ptr;
+  gint length;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (iter != NULL);
@@ -979,6 +980,10 @@ gtk_list_store_insert (GtkListStore *list_store,
 
   seq = list_store->seq;
 
+  length = _gtk_sequence_get_length (seq);
+  if (position > length)
+    position = length;
+
   ptr = _gtk_sequence_get_ptr_at_pos (seq, position);
   ptr = _gtk_sequence_insert (ptr, NULL);